Bump SCRIPT_VERIFY flags to 64 bit #95
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ajtowns
force-pushed
the
202509-inq29-script-verify-flags
branch
2 times, most recently
from
3effbba to
26f7c2d
Compare
Previously the SCRIPT_VERIFY_* flags were specified as either uint32_t, unsigned int, or unsigned. This converts them to a common type alias in preparation for changing the underlying type.
`using script_verify_flags = uint32_t` allows implicit conversion to and from int, so replace it with a class to have the compiler ensure we use the correct type. Provide from_int and as_int to allow for explicit conversions when desired. Introduces the type `script_verify_flag_name` for the individual flag name enumeration.
ajtowns
force-pushed
the
202509-inq29-script-verify-flags
branch
from
26f7c2d to
5c4dea3
Compare
|
concept ACK, seems to match description of upstream PR + backporting changes |
|
#86 runs cleanly on top of this PR, tACK that far at least, and output of binana.h makes sense to me |
ajtowns
commented
Sep 10, 2025
| std::set<script_verify_flags> flags_combos; | ||
| for (const auto& pair : mapFlagNames) { | ||
| const unsigned int flags_excluding_one = TrimFlags(flags & ~(pair.second)); | ||
| script_verify_flags flags_excluding_one = TrimFlags(flags & ~(pair.second)); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport of bitcoin#32998 excluding simplifying
script_verify_flag_nameto an ordinary enum. Includes backport of bitcoin-core/gui#881 due to qt6 bug.